projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6f3fce0
)
(ediff-window-setup-function): Extend type declaration.
author
Markus Rost
<rost@math.uni-bielefeld.de>
Fri, 26 Jul 2002 02:10:56 +0000
(
02:10
+0000)
committer
Markus Rost
<rost@math.uni-bielefeld.de>
Fri, 26 Jul 2002 02:10:56 +0000
(
02:10
+0000)
lisp/ediff-wind.el
patch
|
blob
|
history
diff --git
a/lisp/ediff-wind.el
b/lisp/ediff-wind.el
index 8d8334705d22d6cf4948f792b404e6fcc556b565..ae65b1d6f51131ce31fd4afad0f04017eecf731e 100644
(file)
--- a/
lisp/ediff-wind.el
+++ b/
lisp/ediff-wind.el
@@
-94,7
+94,9
@@
The basic guidelines:
Buffer C may not be used in jobs that compare only two buffers.
If you plan to do something fancy, take a close look at how the two
provided functions are written."
- :type 'function
+ :type '(choice (const :tag "Multi Frame" ediff-setup-windows-multiframe)
+ (const :tag "Single Frame" ediff-setup-windows-plain)
+ (function :tag "Other function"))
:group 'ediff-window)
;; indicates if we are in a multiframe setup